From 8baf72897542a16be12822b4025da19b3c639bd5 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Mon, 27 Sep 2004 01:01:43 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.186 (41576677S5QEgpnRR53rt-wqZY63Kw) Revert some annoying 2.4 config changes. --- linux-2.4.27-xen-sparse/arch/xen/config.in | 4 ---- linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 | 2 +- linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/linux-2.4.27-xen-sparse/arch/xen/config.in b/linux-2.4.27-xen-sparse/arch/xen/config.in index 2ed848d505..231612959a 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/config.in +++ b/linux-2.4.27-xen-sparse/arch/xen/config.in @@ -25,14 +25,10 @@ define_bool CONFIG_NO_IDLE_HZ y if [ "$CONFIG_XEN_PHYSDEV_ACCESS" == "y" ]; then define_bool CONFIG_FOREIGN_PAGES y - define_bool CONFIG_XEN_BLKDEV_FRONTEND n - define_bool CONFIG_XEN_NETDEV_FRONTEND n else define_bool CONFIG_FOREIGN_PAGES n define_bool CONFIG_NETDEVICES y define_bool CONFIG_VT n - define_bool CONFIG_XEN_BLKDEV_FRONTEND y - define_bool CONFIG_XEN_NETDEV_FRONTEND y fi mainmenu_option next_comment diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 index fac68182d1..44a4e87ef7 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 @@ -219,7 +219,7 @@ CONFIG_IP_NF_TARGET_ULOG=y # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=y # CONFIG_IPX is not set # CONFIG_ATALK is not set diff --git a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU index 6e66c3c9af..2842481292 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU @@ -17,8 +17,6 @@ CONFIG_UID16=y CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_NO_IDLE_HZ=y # CONFIG_FOREIGN_PAGES is not set CONFIG_NETDEVICES=y @@ -157,7 +155,7 @@ CONFIG_IP_NF_TARGET_ULOG=y # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=y # CONFIG_IPX is not set # CONFIG_ATALK is not set -- 2.30.2